Merge git://git.denx.de/u-boot-ubi
authorTom Rini <[email protected]>
Mon, 20 Nov 2017 16:46:08 +0000 (11:46 -0500)
committerTom Rini <[email protected]>
Mon, 20 Nov 2017 16:46:08 +0000 (11:46 -0500)

Trivial merge